From 6162f9d51a2b41f16df1352a1385972634e1509a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 29 Apr 2006 03:53:25 +0000 Subject: [PATCH] Use _static variants when copying and merging short-lived Pango layouts. 2006-04-28 Matthias Clasen * gtk/gtkcellrenderertext.c (get_size): Use _static variants when copying and merging short-lived Pango layouts. (#340033, Morten Welinder) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkcellrenderertext.c | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c03069f32b..21b30ef4e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-28 Matthias Clasen + + * gtk/gtkcellrenderertext.c (get_size): Use _static variants when + copying and merging short-lived Pango layouts. (#340033, Morten Welinder) + 2006-04-28 Behdad Esfahbod * gtk/gtkwidget.c (gtk_widget_create_pango_layout): Fix typo in diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c03069f32b..21b30ef4e5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-04-28 Matthias Clasen + + * gtk/gtkcellrenderertext.c (get_size): Use _static variants when + copying and merging short-lived Pango layouts. (#340033, Morten Welinder) + 2006-04-28 Behdad Esfahbod * gtk/gtkwidget.c (gtk_widget_create_pango_layout): Fix typo in diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 0029a28620..a821e1d847 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -1497,8 +1497,8 @@ get_size (GtkCellRenderer *cell, PangoFontDescription *font_desc; gint row_height; - font_desc = pango_font_description_copy (widget->style->font_desc); - pango_font_description_merge (font_desc, celltext->font, TRUE); + font_desc = pango_font_description_copy_static (widget->style->font_desc); + pango_font_description_merge_static (font_desc, celltext->font, TRUE); if (celltext->scale_set) pango_font_description_set_size (font_desc, -- 2.30.2